Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source:
path: ..

build:
number: 0
number: 1
script: {{ PYTHON }} -m pip install . -vv

requirements:
Expand Down
26 changes: 6 additions & 20 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,10 @@ fn has_blocker_on_node_after_target(
/// If no valid candidate is found, the original value is kept unchanged.
///
/// block_key:
/// - Optional key/value matcher applied at node level for both self and ancestor nodes.
/// - For the current self and each ancestor node encountered during traversal, if that node
/// has any blocker event with target_col > current reference target, traversal is terminated.
/// - Optional key/value matcher applied at node level for the current parent chain.
/// - For each parent node encountered during traversal (starting from this row's immediate
/// parent), if that node has any blocker event with target_col > current reference target,
/// traversal is terminated.
/// - In that case the original target value remains unchanged.
fn propagate_target_rows(
py: Python<'_>,
Expand Down Expand Up @@ -261,21 +262,6 @@ fn propagate_target_rows(
}
let anchor_target = start_target.clone();

let start_self_key = composite_key(&start_row, self_cols)?;
if let Some(kv) = block_key {
if has_blocker_on_node_after_target(
py,
rows,
&self_index_all,
&start_self_key,
&anchor_target,
target_col,
kv,
)? {
continue;
}
}

let mut current_parent = composite_key(&start_row, parent_cols)?;
let mut current_target = start_target;
let mut visited = HashSet::new();
Expand Down Expand Up @@ -505,7 +491,7 @@ mod tests {
}

#[test]
fn node_level_self_blocker_prevents_propagation() {
fn node_level_self_blocker_does_not_prevent_propagation() {
Python::attach(|py| {
let rows: Vec<Py<PyDict>> = vec![
[
Expand Down Expand Up @@ -566,7 +552,7 @@ mod tests {
.expect("leaf install ts exists")
.extract()
.expect("leaf install ts string");
assert_eq!(leaf_install_ts, "3");
assert_eq!(leaf_install_ts, "1");
});
}

Expand Down