Skip to content

Commit 56c62c8

Browse files
authored
Remove Arrange::arrange_core (#509)
The function is a thin wrapper around the freestanding `arrange_core` function, and doesn't add any additional value. It's not used within differential. Signed-off-by: Moritz Hoffmann <[email protected]>
1 parent be698bc commit 56c62c8

File tree

1 file changed

+2
-32
lines changed

1 file changed

+2
-32
lines changed

src/operators/arrange/arrangement.rs

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -369,15 +369,6 @@ where
369369
Tr::Batch: Batch,
370370
Tr::Batcher: Batcher<Input=C>,
371371
;
372-
373-
/// Arranges updates into a shared trace, using a supplied parallelization contract, with a supplied name.
374-
fn arrange_core<P, Tr>(&self, pact: P, name: &str) -> Arranged<G, TraceAgent<Tr>>
375-
where
376-
P: ParallelizationContract<G::Timestamp, C>,
377-
Tr: Trace<Time=G::Timestamp>+'static,
378-
Tr::Batch: Batch,
379-
Tr::Batcher: Batcher<Input=C>,
380-
;
381372
}
382373

383374
impl<G, K, V, R> Arrange<G, Vec<((K, V), G::Timestamp, R)>> for Collection<G, (K, V), R>
@@ -395,17 +386,7 @@ where
395386
Tr::Batcher: Batcher<Input=Vec<((K, V), G::Timestamp, R)>>,
396387
{
397388
let exchange = Exchange::new(move |update: &((K,V),G::Timestamp,R)| (update.0).0.hashed().into());
398-
self.arrange_core(exchange, name)
399-
}
400-
401-
fn arrange_core<P, Tr>(&self, pact: P, name: &str) -> Arranged<G, TraceAgent<Tr>>
402-
where
403-
P: ParallelizationContract<G::Timestamp, Vec<((K,V),G::Timestamp,R)>>,
404-
Tr: Trace<Time=G::Timestamp>+'static,
405-
Tr::Batch: Batch,
406-
Tr::Batcher: Batcher<Input=Vec<((K,V),G::Timestamp,R)>>,
407-
{
408-
arrange_core(&self.inner, pact, name)
389+
arrange_core(&self.inner, exchange, name)
409390
}
410391
}
411392

@@ -583,18 +564,7 @@ where
583564
Tr::Batcher: Batcher<Input=Vec<((K, ()), G::Timestamp, R)>>,
584565
{
585566
let exchange = Exchange::new(move |update: &((K,()),G::Timestamp,R)| (update.0).0.hashed().into());
586-
self.arrange_core(exchange, name)
587-
}
588-
589-
fn arrange_core<P, Tr>(&self, pact: P, name: &str) -> Arranged<G, TraceAgent<Tr>>
590-
where
591-
P: ParallelizationContract<G::Timestamp, Vec<((K,()),G::Timestamp,R)>>,
592-
Tr: Trace<Time=G::Timestamp>+'static,
593-
Tr::Batch: Batch,
594-
Tr::Batcher: Batcher<Input=Vec<((K,()),G::Timestamp,R)>>,
595-
{
596-
self.map(|k| (k, ()))
597-
.arrange_core(pact, name)
567+
arrange_core(&self.map(|k| (k, ())).inner, exchange, name)
598568
}
599569
}
600570

0 commit comments

Comments
 (0)