mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-08 21:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

tree_builder: when writing trees, rely on lexicographical order of RepoPath

Browse source
This commit is contained in:
Yuya Nishihara 2023-05-31 19:30:48 +09:00
parent ae9f7aba52
commit 68a30c934d
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/src/tree_builder.rs
View file

@ -12,9 +12,11 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use std::collections::{BTreeMap, HashSet}; use std::collections::BTreeMap;
use std::sync::Arc; use std::sync::Arc;
use itertools::Itertools as _;
use crate::backend; use crate::backend;
use crate::backend::{TreeId, TreeValue}; use crate::backend::{TreeId, TreeValue};
use crate::repo_path::{RepoPath, RepoPathJoin}; use crate::repo_path::{RepoPath, RepoPathJoin};
@ -81,34 +83,29 @@ impl TreeBuilder {
} }
} }
// Write trees level by level, starting with trees without children. // Write trees in reverse lexicographical order, starting with trees without
// children.
let store = self.store.as_ref(); let store = self.store.as_ref();
loop { // TODO: trees_to_write.pop_last() can be used, but requires Rust 1.66.0
let mut dirs_to_write: HashSet<RepoPath> = trees_to_write.keys().cloned().collect(); let mut dirs_to_write = trees_to_write.keys().cloned().collect_vec();
while let Some(dir) = dirs_to_write.pop() {
for dir in trees_to_write.keys() { let tree = trees_to_write.remove(&dir).unwrap();
if let Some(parent) = dir.parent() { if let Some((parent, basename)) = dir.split() {
dirs_to_write.remove(&parent); let parent_tree = trees_to_write.get_mut(&parent).unwrap();
} if tree.is_empty() {
} parent_tree.remove(basename);
for dir in dirs_to_write {
let tree = trees_to_write.remove(&dir).unwrap();
if let Some((parent, basename)) = dir.split() {
let parent_tree = trees_to_write.get_mut(&parent).unwrap();
if tree.is_empty() {
parent_tree.remove(basename);
} else {
let tree_id = store.write_tree(&dir, &tree).unwrap();
parent_tree.set(basename.clone(), TreeValue::Tree(tree_id));
}
} else { } else {
// We're writing the root tree. Write it even if empty. Return its id. let tree_id = store.write_tree(&dir, &tree).unwrap();
return store.write_tree(&dir, &tree).unwrap(); parent_tree.set(basename.clone(), TreeValue::Tree(tree_id));
} }
} else {
// We're writing the root tree. Write it even if empty. Return its id.
assert!(dirs_to_write.is_empty());
return store.write_tree(&dir, &tree).unwrap();
} }
} }
unreachable!("trees_to_write must contain the root tree");
} }
fn get_base_trees(&mut self) -> BTreeMap<RepoPath, backend::Tree> { fn get_base_trees(&mut self) -> BTreeMap<RepoPath, backend::Tree> {