Skip to content

Respect singleton counts in merge effort #614

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
frankmcsherry merged 1 commit into from
Jun 25, 2025
Merged

Respect singleton counts in merge effort #614

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions differential-dataflow/src/trace/implementations/ord_neu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,27 +270,27 @@ pub mod val_batch {
fn work(&mut self, source1: &OrdValBatch<L>, source2: &OrdValBatch<L>, fuel: &mut isize) {

// An (incomplete) indication of the amount of work we've done so far.
let starting_updates = self.result.times.len();
let starting_updates = self.result.times.len() + self.singletons;
let mut effort = 0isize;

// While both mergees are still active, perform single-key merges.
while self.key_cursor1 < source1.storage.keys.len() && self.key_cursor2 < source2.storage.keys.len() && effort < *fuel {
self.merge_key(&source1.storage, &source2.storage);
// An (incomplete) accounting of the work we've done.
effort = (self.result.times.len() - starting_updates) as isize;
effort = (self.result.times.len() + self.singletons - starting_updates) as isize;
}

// Merging is complete, and only copying remains.
// Key-by-key copying allows effort interruption, and compaction.
while self.key_cursor1 < source1.storage.keys.len() && effort < *fuel {
self.copy_key(&source1.storage, self.key_cursor1);
self.key_cursor1 += 1;
effort = (self.result.times.len() - starting_updates) as isize;
effort = (self.result.times.len() + self.singletons - starting_updates) as isize;
}
while self.key_cursor2 < source2.storage.keys.len() && effort < *fuel {
self.copy_key(&source2.storage, self.key_cursor2);
self.key_cursor2 += 1;
effort = (self.result.times.len() - starting_updates) as isize;
effort = (self.result.times.len() + self.singletons - starting_updates) as isize;
}

*fuel -= effort;
Expand Down Expand Up @@ -864,27 +864,27 @@ pub mod key_batch {
fn work(&mut self, source1: &OrdKeyBatch<L>, source2: &OrdKeyBatch<L>, fuel: &mut isize) {

// An (incomplete) indication of the amount of work we've done so far.
let starting_updates = self.result.times.len();
let starting_updates = self.result.times.len() + self.singletons;
let mut effort = 0isize;

// While both mergees are still active, perform single-key merges.
while self.key_cursor1 < source1.storage.keys.len() && self.key_cursor2 < source2.storage.keys.len() && effort < *fuel {
self.merge_key(&source1.storage, &source2.storage);
// An (incomplete) accounting of the work we've done.
effort = (self.result.times.len() - starting_updates) as isize;
effort = (self.result.times.len() + self.singletons - starting_updates) as isize;
}

// Merging is complete, and only copying remains.
// Key-by-key copying allows effort interruption, and compaction.
while self.key_cursor1 < source1.storage.keys.len() && effort < *fuel {
self.copy_key(&source1.storage, self.key_cursor1);
self.key_cursor1 += 1;
effort = (self.result.times.len() - starting_updates) as isize;
effort = (self.result.times.len() + self.singletons - starting_updates) as isize;
}
while self.key_cursor2 < source2.storage.keys.len() && effort < *fuel {
self.copy_key(&source2.storage, self.key_cursor2);
self.key_cursor2 += 1;
effort = (self.result.times.len() - starting_updates) as isize;
effort = (self.result.times.len() + self.singletons - starting_updates) as isize;
}

*fuel -= effort;
Expand Down