Skip to content

join: simplify logic passed to Deferred::work #392

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

join: simplify logic passed to Deferred::work #392

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
52 changes: 26 additions & 26 deletions src/operators/join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ impl<G, T1> JoinCore<G, T1::Key, T1::Val, T1::R> for Arranged<G,T1>
// at start-up, and have held back physical compaction ever since.
let (trace2_cursor, trace2_storage) = trace2.cursor_through(acknowledged2.borrow()).unwrap();
let batch1_cursor = batch1.cursor();
todo1.push_back(Deferred::new(trace2_cursor, trace2_storage, batch1_cursor, batch1.clone(), capability.clone()));
todo1.push_back(Deferred::new(batch1_cursor, batch1.clone(), trace2_cursor, trace2_storage, capability.clone()));
}

// To update `acknowledged1` we might presume that `batch1.lower` should equal it, but we
Expand Down Expand Up @@ -564,7 +564,7 @@ impl<G, T1> JoinCore<G, T1::Key, T1::Val, T1::R> for Arranged<G,T1>
while !todo1.is_empty() && fuel > 0 {
todo1.front_mut().unwrap().work(
output,
|k,v2,v1,t,r2,r1| result(k,v1,v2,t,r1,r2),
&mut result,
&mut fuel
);
if !todo1.front().unwrap().work_remains() { todo1.pop_front(); }
Expand All @@ -575,7 +575,7 @@ impl<G, T1> JoinCore<G, T1::Key, T1::Val, T1::R> for Arranged<G,T1>
while !todo2.is_empty() && fuel > 0 {
todo2.front_mut().unwrap().work(
output,
|k,v1,v2,t,r1,r2| result(k,v1,v2,t,r1,r2),
&mut result,
&mut fuel
);
if !todo2.front().unwrap().work_remains() { todo2.pop_front(); }
Expand Down Expand Up @@ -648,10 +648,10 @@ where
D: Ord+Clone+Data,
{
phant: ::std::marker::PhantomData<K>,
trace: C1,
trace_storage: C1::Storage,
batch: C2,
batch_storage: C2::Storage,
cursor1: C1,
storage1: C1::Storage,
cursor2: C2,
storage2: C2::Storage,
capability: Capability<T>,
done: bool,
temp: Vec<((D, T), R)>,
Expand All @@ -670,13 +670,13 @@ where
R: Semigroup,
D: Clone+Data,
{
fn new(trace: C1, trace_storage: C1::Storage, batch: C2, batch_storage: C2::Storage, capability: Capability<T>) -> Self {
fn new(cursor1: C1, storage1: C1::Storage, cursor2: C2, storage2: C2::Storage, capability: Capability<T>) -> Self {
Deferred {
phant: ::std::marker::PhantomData,
trace,
trace_storage,
batch,
batch_storage,
cursor1,
storage1,
cursor2,
storage2,
capability,
done: false,
temp: Vec::new(),
Expand All @@ -697,30 +697,30 @@ where
let mut effort = 0;
let mut session = output.session(&self.capability);

let trace_storage = &self.trace_storage;
let batch_storage = &self.batch_storage;
let storage1 = &self.storage1;
let storage2 = &self.storage2;

let trace = &mut self.trace;
let batch = &mut self.batch;
let cursor1 = &mut self.cursor1;
let cursor2 = &mut self.cursor2;

let temp = &mut self.temp;
let mut thinker = JoinThinker::new();

while batch.key_valid(batch_storage) && trace.key_valid(trace_storage) && effort < *fuel {
while cursor1.key_valid(storage1) && cursor2.key_valid(storage2) && effort < *fuel {

match trace.key(trace_storage).cmp(batch.key(batch_storage)) {
Ordering::Less => trace.seek_key(trace_storage, batch.key(batch_storage)),
Ordering::Greater => batch.seek_key(batch_storage, trace.key(trace_storage)),
match cursor1.key(storage1).cmp(cursor2.key(storage2)) {
Ordering::Less => cursor1.seek_key(storage1, cursor2.key(storage2)),
Ordering::Greater => cursor2.seek_key(storage2, cursor1.key(storage1)),
Ordering::Equal => {

thinker.history1.edits.load(trace, trace_storage, |time| time.join(&meet));
thinker.history2.edits.load(batch, batch_storage, |time| time.clone());
thinker.history1.edits.load(cursor1, storage1, |time| time.join(meet));
thinker.history2.edits.load(cursor2, storage2, |time| time.join(meet));

assert_eq!(temp.len(), 0);

// populate `temp` with the results in the best way we know how.
thinker.think(|v1,v2,t,r1,r2| {
let key = batch.key(batch_storage);
let key = cursor1.key(storage1);
for (d, t, r) in logic(key, v1, v2, &t, r1, r2) {
temp.push(((d, t), r));
}
Expand All @@ -738,16 +738,16 @@ where
session.give((d, t, r));
}

batch.step_key(batch_storage);
trace.step_key(trace_storage);
cursor1.step_key(storage1);
cursor2.step_key(storage2);

thinker.history1.clear();
thinker.history2.clear();
}
}
}

self.done = !batch.key_valid(batch_storage) || !trace.key_valid(trace_storage);
self.done = !cursor1.key_valid(storage1) || !cursor2.key_valid(storage2);

if effort > *fuel { *fuel = 0; }
else { *fuel -= effort; }
Expand Down