mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-28 17:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

revset: make evaluation helper not create trait object eagerly

Browse source 
We wouldn't care for the cost of virtual dispatch at this level, but I
think a concrete struct type is easier to deal with than trait object.
This commit is contained in:
Yuya Nishihara 2023-04-07 11:53:49 +09:00
parent 85fb1f74c3
commit 5dd99db250
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/src/default_revset_engine.rs
View file

@ -634,7 +634,9 @@ impl<'index, 'heads> EvaluationContext<'index, 'heads> {
let walk = self.composite_index.walk_revs(self.visible_heads, &[]); let walk = self.composite_index.walk_revs(self.visible_heads, &[]);
Ok(Box::new(RevWalkRevset { walk })) Ok(Box::new(RevWalkRevset { walk }))
} }
RevsetExpression::Commits(commit_ids) => Ok(self.revset_for_commit_ids(commit_ids)), RevsetExpression::Commits(commit_ids) => {
Ok(Box::new(self.revset_for_commit_ids(commit_ids)))
}
RevsetExpression::Children(roots) => { RevsetExpression::Children(roots) => {
let root_set = self.evaluate(roots)?; let root_set = self.evaluate(roots)?;
let candidates_expression = roots.descendants(); let candidates_expression = roots.descendants();
@ -677,15 +679,18 @@ impl<'index, 'heads> EvaluationContext<'index, 'heads> {
let (dag_range_set, _) = self.collect_dag_range(&*root_set, &*head_set); let (dag_range_set, _) = self.collect_dag_range(&*root_set, &*head_set);
Ok(Box::new(dag_range_set)) Ok(Box::new(dag_range_set))
} }
RevsetExpression::VisibleHeads => Ok(self.revset_for_commit_ids(self.visible_heads)), RevsetExpression::VisibleHeads => {
Ok(Box::new(self.revset_for_commit_ids(self.visible_heads)))
}
RevsetExpression::Heads(candidates) => { RevsetExpression::Heads(candidates) => {
let candidate_set = self.evaluate(candidates)?; let candidate_set = self.evaluate(candidates)?;
let candidate_ids = candidate_set let candidate_ids = candidate_set
.iter() .iter()
.map(|entry| entry.commit_id()) .map(|entry| entry.commit_id())
.collect_vec(); .collect_vec();
Ok(self Ok(Box::new(self.revset_for_commit_ids(
.revset_for_commit_ids(&self.composite_index.heads(&mut candidate_ids.iter()))) &self.composite_index.heads(&mut candidate_ids.iter()),
)))
} }
RevsetExpression::Roots(candidates) => { RevsetExpression::Roots(candidates) => {
let candidate_set = EagerRevset { let candidate_set = EagerRevset {
@ -706,7 +711,9 @@ impl<'index, 'heads> EvaluationContext<'index, 'heads> {
} }
RevsetExpression::Latest { candidates, count } => { RevsetExpression::Latest { candidates, count } => {
let candidate_set = self.evaluate(candidates)?; let candidate_set = self.evaluate(candidates)?;
Ok(self.take_latest_revset(candidate_set.as_ref(), *count)) Ok(Box::new(
self.take_latest_revset(candidate_set.as_ref(), *count),
))
} }
RevsetExpression::Filter(_) | RevsetExpression::AsFilter(_) => { RevsetExpression::Filter(_) | RevsetExpression::AsFilter(_) => {
// Top-level filter without intersection: e.g. "~author(_)" is represented as // Top-level filter without intersection: e.g. "~author(_)" is represented as
@ -848,26 +855,23 @@ impl<'index, 'heads> EvaluationContext<'index, 'heads> {
(EagerRevset { index_entries }, reachable) (EagerRevset { index_entries }, reachable)
} }
fn revset_for_commit_ids( fn revset_for_commit_ids(&self, commit_ids: &[CommitId]) -> EagerRevset<'index> {
&self,
commit_ids: &[CommitId],
) -> Box<dyn InternalRevset<'index> + 'index> {
let mut index_entries = vec![]; let mut index_entries = vec![];
for id in commit_ids { for id in commit_ids {
index_entries.push(self.composite_index.entry_by_id(id).unwrap()); index_entries.push(self.composite_index.entry_by_id(id).unwrap());
} }
index_entries.sort_unstable_by_key(|b| Reverse(b.position())); index_entries.sort_unstable_by_key(|b| Reverse(b.position()));
index_entries.dedup(); index_entries.dedup();
Box::new(EagerRevset { index_entries }) EagerRevset { index_entries }
} }
fn take_latest_revset( fn take_latest_revset(
&self, &self,
candidate_set: &dyn InternalRevset<'index>, candidate_set: &dyn InternalRevset<'index>,
count: usize, count: usize,
) -> Box<dyn InternalRevset<'index> + 'index> { ) -> EagerRevset<'index> {
if count == 0 { if count == 0 {
return Box::new(EagerRevset::empty()); return EagerRevset::empty();
} }
#[derive(Clone, Eq, Ord, PartialEq, PartialOrd)] #[derive(Clone, Eq, Ord, PartialEq, PartialOrd)]
@ -902,7 +906,7 @@ impl<'index, 'heads> EvaluationContext<'index, 'heads> {
.map(|item| item.0.entry.0) .map(|item| item.0.entry.0)
.collect_vec(); .collect_vec();
index_entries.sort_unstable_by_key(|b| Reverse(b.position())); index_entries.sort_unstable_by_key(|b| Reverse(b.position()));
Box::new(EagerRevset { index_entries }) EagerRevset { index_entries }
} }
} }