Skip to content

Intern import details/metadata line contents #185

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
seddonym merged 4 commits into from
Feb 11, 2025
Merged

Intern import details/metadata line contents #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d701e8
Add line number and contents to large graph
Peter554 Feb 8, 2025
669eb8d
Intern strings for import details line contents
Peter554 Feb 7, 2025
98fa5ac
Rename Module.name as interned_name
Peter554 Feb 7, 2025
ae3ea3d
Use u32 for import details line number
Peter554 Feb 7, 2025
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
20 changes: 13 additions & 7 deletions rust/src/graph/graph_manipulation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use crate::graph::{Graph, ImportDetails, Module, ModuleIterator, ModuleToken, MODULE_NAMES};
use crate::graph::{
Graph, ImportDetails, Module, ModuleIterator, ModuleToken, IMPORT_LINE_CONTENTS, MODULE_NAMES,
};
use rustc_hash::FxHashSet;
use slotmap::secondary::Entry;

Expand Down Expand Up @@ -31,7 +33,7 @@ impl Graph {
} else {
let module = self.modules.insert_with_key(|token| Module {
token,
name,
interned_name: name,
is_invisible: !ancestor_names.is_empty(),
is_squashed: false,
});
Expand Down Expand Up @@ -116,7 +118,7 @@ impl Graph {
&mut self,
importer: ModuleToken,
imported: ModuleToken,
line_number: usize,
line_number: u32,
line_contents: &str,
) {
self.imports
Expand All @@ -129,10 +131,14 @@ impl Graph {
.unwrap()
.or_default()
.insert(importer);
self.import_details
.entry((importer, imported))
.or_default()
.insert(ImportDetails::new(line_number, line_contents.to_owned()));
{
let mut interner = IMPORT_LINE_CONTENTS.write().unwrap();
let line_contents = interner.get_or_intern(line_contents);
self.import_details
.entry((importer, imported))
.or_default()
.insert(ImportDetails::new(line_number, line_contents));
}
}

pub fn remove_import(&mut self, importer: ModuleToken, imported: ModuleToken) {
Expand Down
33 changes: 22 additions & 11 deletions rust/src/graph/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ pub(crate) mod pathfinding;
lazy_static! {
static ref MODULE_NAMES: RwLock<StringInterner<StringBackend>> =
RwLock::new(StringInterner::default());
static ref IMPORT_LINE_CONTENTS: RwLock<StringInterner<StringBackend>> =
RwLock::new(StringInterner::default());
static ref EMPTY_MODULE_TOKENS: FxHashSet<ModuleToken> = FxHashSet::default();
static ref EMPTY_IMPORT_DETAILS: FxHashSet<ImportDetails> = FxHashSet::default();
static ref EMPTY_IMPORTS: FxHashSet<(ModuleToken, ModuleToken)> = FxHashSet::default();
Expand All @@ -32,7 +34,7 @@ pub struct Module {
token: ModuleToken,

#[getset(get_copy = "pub")]
name: DefaultSymbol,
interned_name: DefaultSymbol,

// Invisible modules exist in the hierarchy but haven't been explicitly added to the graph.
#[getset(get_copy = "pub")]
Expand All @@ -43,9 +45,9 @@ pub struct Module {
}

impl Module {
pub fn name_as_string(&self) -> String {
pub fn name(&self) -> String {
let interner = MODULE_NAMES.read().unwrap();
interner.resolve(self.name).unwrap().to_owned()
interner.resolve(self.interned_name).unwrap().to_owned()
}
}

Expand Down Expand Up @@ -102,13 +104,13 @@ pub trait ModuleIterator<'a>: Iterator<Item = &'a Module> + Sized {
self.map(|m| m.token)
}

fn names(self) -> impl Iterator<Item = DefaultSymbol> {
self.map(|m| m.name)
fn interned_names(self) -> impl Iterator<Item = DefaultSymbol> {
self.map(|m| m.interned_name)
}

fn names_as_strings(self) -> impl Iterator<Item = String> {
fn names(self) -> impl Iterator<Item = String> {
let interner = MODULE_NAMES.read().unwrap();
self.map(move |m| interner.resolve(m.name).unwrap().to_owned())
self.map(move |m| interner.resolve(m.interned_name).unwrap().to_owned())
}

fn visible(self) -> impl ModuleIterator<'a> {
Expand All @@ -129,9 +131,18 @@ impl<'a, T: Iterator<Item = &'a ModuleToken>> ModuleTokenIterator<'a> for T {}
#[derive(Debug, Clone, PartialEq, Eq, Hash, new, Getters, CopyGetters)]
pub struct ImportDetails {
#[getset(get_copy = "pub")]
line_number: usize,
line_number: u32,

#[new(into)]
#[getset(get = "pub")]
line_contents: String,
#[getset(get_copy = "pub")]
interned_line_contents: DefaultSymbol,
}

impl ImportDetails {
pub fn line_contents(&self) -> String {
let interner = IMPORT_LINE_CONTENTS.read().unwrap();
interner
.resolve(self.interned_line_contents)
.unwrap()
.to_owned()
}
}
53 changes: 20 additions & 33 deletions rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,7 @@ impl GraphWrapper {
}

pub fn get_modules(&self) -> HashSet<String> {
self._graph
.all_modules()
.visible()
.names_as_strings()
.collect()
self._graph.all_modules().visible().names().collect()
}

pub fn contains_module(&self, name: &str) -> bool {
Expand Down Expand Up @@ -115,7 +111,7 @@ impl GraphWrapper {
&mut self,
importer: &str,
imported: &str,
line_number: Option<usize>,
line_number: Option<u32>,
line_contents: Option<&str>,
) {
let importer = self._graph.get_or_add_module(importer).token();
Expand Down Expand Up @@ -156,7 +152,7 @@ impl GraphWrapper {
._graph
.get_module_children(module.token())
.visible()
.names_as_strings()
.names()
.collect())
}

Expand All @@ -169,7 +165,7 @@ impl GraphWrapper {
._graph
.get_module_descendants(module.token())
.visible()
.names_as_strings()
.names()
.collect())
}

Expand All @@ -195,7 +191,7 @@ impl GraphWrapper {
.iter()
.into_module_iterator(&self._graph)
.visible()
.names_as_strings()
.names()
.collect())
}

Expand All @@ -207,7 +203,7 @@ impl GraphWrapper {
.iter()
.into_module_iterator(&self._graph)
.visible()
.names_as_strings()
.names()
.collect())
}

Expand All @@ -234,10 +230,10 @@ impl GraphWrapper {
.iter()
.map(|import_details| {
ImportDetails::new(
importer.name_as_string(),
imported.name_as_string(),
importer.name(),
imported.name(),
import_details.line_number(),
import_details.line_contents().to_owned(),
import_details.line_contents(),
)
})
.sorted()
Expand Down Expand Up @@ -274,7 +270,7 @@ impl GraphWrapper {
.iter()
.into_module_iterator(&self._graph)
.visible()
.names_as_strings()
.names()
.collect())
}

Expand All @@ -292,7 +288,7 @@ impl GraphWrapper {
.iter()
.into_module_iterator(&self._graph)
.visible()
.names_as_strings()
.names()
.collect())
}

Expand All @@ -311,7 +307,7 @@ impl GraphWrapper {
chain
.iter()
.into_module_iterator(&self._graph)
.names_as_strings()
.names()
.collect()
}))
}
Expand Down Expand Up @@ -348,7 +344,7 @@ impl GraphWrapper {
chain
.iter()
.into_module_iterator(&self._graph)
.names_as_strings()
.names()
.collect::<Vec<_>>(),
)
.unwrap()
Expand Down Expand Up @@ -391,32 +387,26 @@ impl GraphWrapper {
.into_iter()
.map(|dep| {
PackageDependency::new(
self._graph
.get_module(*dep.importer())
.unwrap()
.name_as_string(),
self._graph
.get_module(*dep.imported())
.unwrap()
.name_as_string(),
self._graph.get_module(*dep.importer()).unwrap().name(),
self._graph.get_module(*dep.imported()).unwrap().name(),
dep.routes()
.iter()
.map(|route| {
Route::new(
route
.heads()
.iter()
.map(|m| self._graph.get_module(*m).unwrap().name_as_string())
.map(|m| self._graph.get_module(*m).unwrap().name())
.collect(),
route
.middle()
.iter()
.map(|m| self._graph.get_module(*m).unwrap().name_as_string())
.map(|m| self._graph.get_module(*m).unwrap().name())
.collect(),
route
.tails()
.iter()
.map(|m| self._graph.get_module(*m).unwrap().name_as_string())
.map(|m| self._graph.get_module(*m).unwrap().name())
.collect(),
)
})
Expand Down Expand Up @@ -460,10 +450,7 @@ impl GraphWrapper {
) -> Vec<Vec<Level>> {
let containers = match containers.is_empty() {
true => vec![None],
false => containers
.iter()
.map(|c| Some(c.name_as_string()))
.collect(),
false => containers.iter().map(|c| Some(c.name())).collect(),
};

let mut levels_by_container: Vec<Vec<Level>> = vec![];
Expand Down Expand Up @@ -553,7 +540,7 @@ impl GraphWrapper {
struct ImportDetails {
importer: String,
imported: String,
line_number: usize,
line_number: u32,
line_contents: String,
}

Expand Down
7 changes: 6 additions & 1 deletion tests/benchmarking/test_benchmarking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ def large_graph():
for importer, importeds in graph_dict.items():
graph.add_module(importer)
for imported in importeds:
graph.add_import(importer=importer, imported=imported)
graph.add_import(
importer=importer,
imported=imported,
line_number=1,
line_contents=f"import {imported}",
Comment on lines +26 to +27
Copy link
Collaborator Author

@Peter554 Peter554 Feb 8, 2025

Choose a reason for hiding this comment

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

This change introduces a regression in the benchmark for test_copy_graph, but this is reasonable since now the graph object is much bigger!

)

return graph

Expand Down
Loading