ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

matchers: build tree of Dirs so prefix match works out of the box

Browse source 
A file entry is represented as a Dirs of is_file flag set. This might seem
odd at this point, but allows us to remove special case from PrefixMatcher.
PrefixMatcher::new(&[RepoPath::root()]) will set is_file to the root entry.
This commit is contained in:
Yuya Nishihara 2022-12-28 11:59:12 +09:00
parent 37fa7c39d4
commit ba632e6ef6
1 changed files with 60 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
lib/src/matchers.rs
View file

@ -269,54 +269,67 @@ impl Matcher for IntersectionMatcher<'_> {
/// visited.
#[derive(PartialEq, Eq, Debug)]
struct Dirs {
dirs: HashMap<RepoPath, HashSet<RepoPathComponent>>,
files: HashMap<RepoPath, HashSet<RepoPathComponent>>,
entries: HashMap<RepoPathComponent, Dirs>,
// is_dir/is_file aren't exclusive, both can be set to true. If entries is not empty,
// is_dir should be set.
is_dir: bool,
is_file: bool,
}
impl Dirs {
fn new() -> Self {
Dirs {
dirs: HashMap::new(),
files: HashMap::new(),
entries: HashMap::new(),
is_dir: false,
is_file: false,
}
}
fn add(&mut self, dir: &RepoPath) -> &mut Dirs {
dir.components().iter().fold(self, |sub, name| {
// Avoid name.clone() if entry already exists.
if !sub.entries.contains_key(name) {
sub.is_dir = true;
sub.entries.insert(name.clone(), Dirs::new());
}
sub.entries.get_mut(name).unwrap()
})
}
fn add_dir(&mut self, dir: &RepoPath) {
let mut dir = dir.clone();
let mut maybe_child = None;
loop {
let was_present = self.dirs.contains_key(&dir);
let children = self.dirs.entry(dir.clone()).or_default();
if let Some(child) = maybe_child {
children.insert(child);
}
if was_present {
break;
}
match dir.split() {
None => break,
Some((new_dir, new_child)) => {
maybe_child = Some(new_child.clone());
dir = new_dir;
}
};
}
self.add(dir).is_dir = true;
}
fn add_file(&mut self, file: &RepoPath) {
let (dir, basename) = file
.split()
.unwrap_or_else(|| panic!("got empty filename: {file:?}"));
self.add_dir(&dir);
self.files.entry(dir).or_default().insert(basename.clone());
self.add(file).is_file = true;
}
fn get(&self, dir: &RepoPath) -> Option<&Dirs> {
dir.components()
.iter()
.try_fold(self, |sub, name| sub.entries.get(name))
}
fn get_dirs(&self, dir: &RepoPath) -> HashSet<RepoPathComponent> {
self.dirs.get(dir).cloned().unwrap_or_default()
self.get(dir)
.map(|sub| {
sub.entries
.iter()
.filter_map(|(name, sub)| sub.is_dir.then(|| name.clone()))
.collect()
})
.unwrap_or_default()
}
fn get_files(&self, dir: &RepoPath) -> HashSet<RepoPathComponent> {
self.files.get(dir).cloned().unwrap_or_default()
self.get(dir)
.map(|sub| {
sub.entries
.iter()
.filter_map(|(name, sub)| sub.is_file.then(|| name.clone()))
.collect()
})
.unwrap_or_default()
}
}
@ -348,6 +361,15 @@ mod tests {
dirs.get_dirs(&RepoPath::root()),
hashset! {RepoPathComponent::from("dir")}
);
dirs.add_dir(&RepoPath::from_internal_string("dir/sub"));
assert_eq!(
dirs.get_dirs(&RepoPath::from_internal_string("dir")),
hashset! {RepoPathComponent::from("sub")}
);
assert_eq!(
dirs.get_files(&RepoPath::from_internal_string("dir")),
hashset! {}
);
}
#[test]
@ -359,6 +381,14 @@ mod tests {
hashset! {RepoPathComponent::from("dir")}
);
assert_eq!(dirs.get_files(&RepoPath::root()), hashset! {});
assert_eq!(
dirs.get_files(&RepoPath::from_internal_string("dir")),
hashset! {RepoPathComponent::from("file")}
);
assert_eq!(
dirs.get_dirs(&RepoPath::from_internal_string("dir")),
hashset! {}
);
}
#[test]